45e52a85a1487195f4016ebfc19853670de40943,src/main/java/com/conveyal/gtfs/model/Trip.java,Loader,loadOneRow,#,44

Before Change


        public void loadOneRow() throws IOException {
            Trip t = new Trip();
            Service service = getRefField("service_id", true, feed.services);
            Route route = getRefField("route_id", true, feed.routes);
            t.route_id        = route != null ? route.route_id : null;
            t.service_id      = service != null ? service.service_id : null;
            t.trip_id         = getStringField("trip_id", true);
            t.trip_headsign   = getStringField("trip_headsign", false);

After Change


        public void loadOneRow() throws IOException {
            Trip t = new Trip();

            t.route_id        = getStringField("route_id", true);
            t.service_id      = getStringField("service_id", true);
            t.trip_id         = getStringField("trip_id", true);
            t.trip_headsign   = getStringField("trip_headsign", false);
            t.trip_short_name = getStringField("trip_short_name", false);
            t.direction_id    = getIntField("direction_id", false, 0, 1);
            t.block_id        = getStringField("block_id", false); // make a blocks multimap
            t.shape_id        = getStringField("shape_id", false);
            t.bikes_allowed   = getIntField("bikes_allowed", false, 0, 2);
            t.wheelchair_accessible = getIntField("wheelchair_accessible", false, 0, 2);
            t.feed = feed;
            t.feed_id = feed.feedId;
            feed.trips.put(t.trip_id, t);

            /*
              Check referential integrity without storing references. Trip cannot directly reference Services or
              Routes because they would be serialized into the MapDB.
             */
            // TODO confirm existence of shape ID
            getRefField("service_id", true, feed.services);
            getRefField("route_id", true, feed.routes);
        }

    }